From bd0d75e237b1093ec85c327df188e01daf8c44aa Mon Sep 17 00:00:00 2001 From: nana-4 Date: Sun, 22 Nov 2020 12:59:28 +0900 Subject: [PATCH] Adwaita: Make sidebar row styling better - Reorder declaration blocks for code legibility. - Don't lighten text color on :hover and :selected for better contrast. - Add missing :focus-visible:focus-within styling to non-:selected row. --- gtk/theme/Adwaita/_common.scss | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index d54d4dc81d..7374453392 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -3604,25 +3604,25 @@ separator.sidebar { border-radius: $menu-margin; margin: 0 $menu-margin; + &:hover, + &:focus-visible:focus-within { + background-color: darken($menu_selected_color, 5%); + } + &:selected { background-color: $menu_selected_color; - color: $fg_color; + color: inherit; + + &:hover { + background-color: darken($menu_selected_color,5%); + } &:focus-visible:focus-within { outline-width: 0; color: $selected_fg_color; background-color: $selected_bg_color; - &:hover { color: $selected_fg_color; background-color: darken($selected_bg_color,10%); } + &:hover { background-color: darken($selected_bg_color,10%); } } - &:hover:not(:last-child) { /* FIXME: dirty specificity bump */ - color: $fg_color; - background-color: darken($menu_selected_color,5%); - } - } - - &:hover { - color: $fg_color; - background-color: darken($menu_selected_color, 5%); } &:disabled { color: $insensitive_fg_color; } -- 2.30.2